Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Wed, 11 Dec 2013 13:36:27 +0000 (13:36 +0000)
committerIan Campbell <ian.campbell@citrix.com>
Wed, 11 Dec 2013 13:36:27 +0000 (13:36 +0000)
commit8faa4049cfc74fc8fa2887d3b5ed0d225a21a97b
tree24e8149cbd2c2ef2d8201bba3a8ebe75cc81c5e8
parentdb94bdb3145c48356d17637a33c4298613215c21
parent7113a45451a9f656deeff070e47672043ed83664
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging